-
Notifications
You must be signed in to change notification settings - Fork 284
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updated keymap and handlerName to new key method #216
Conversation
Thanks for opening this pull request! |
Hi, thank you for the updates! This looks good and is ready for merge @jywarren Two quick tips for the future:
|
All right, I'll note this for future PRs. Thank you for letting me know 😄 |
Okay two things to note here.
@SteliosPhanartzis This is some really nice work, and with the above changes, we shouldn't have any problems merging this. Thank you! 👍 |
@rexagod good point! Just to add on to that, lets keep the comments for these two hotkeys (first 2):
I personally need this as a reminder that windows backspace === delete on a mac but we can delete the rest! |
@sashadev-sky That makes sense. @SteliosPhanartzis Please make the aforementioned changes. Thanks! |
|
Deleted redundant comments for key mappings
@SteliosPhanartzis This looks good. Just one final change, can you please revert your latest commit ( |
@rexagod not disagreeing with you just wondering can you link the guidelines please because I need to read up about this myself @SteliosPhanartzis If you want I think you can just go to
|
@sashadev-sky It can be found here. This file is intended to be committed into source repositories, and serves various purposes:
|
@SteliosPhanartzis hey, good job with this! A big PR was recently merged so that why is you're seeing all of these conflicts now. I will try to rebase for you this time around because you opened the PR before these changes |
@@ -5,20 +5,17 @@ L.DistortableImage.Edit = L.Handler.extend({ | |||
opacity: 0.7, | |||
outline: "1px solid red", | |||
keymap: { | |||
8: "_removeOverlay", // backspace windows / delete mac |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please re-add the two _removeOverlay
lines.
20: "_toggleRotate", // CAPS | ||
27: "_deselect", // esc | ||
68: "_toggleRotateDistort", // d | ||
69: "_toggleIsolate", // e |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please re-add the _toggleIsolate
line for e as well
@SteliosPhanartzis Ok I rebased this so as you can see now the "changed files" only displays your changes so we can see them clearly. By rebasing, your branch now knows what commits are really new coming from you. (Probably not the most exact explanation of what happened but you can read up about this if you are curious). So looking at your updates, it looks like you have left out some keybindings when doing the transition to the new syntax. Please readd them! I commented above so you can easily see which ones. There is already an issue open which I will address in a separate PR to fix keybinding inconsistencies (I see where you were coming from deleting one of the |
@rexagod So I think it should be committed only if there were updates made to dependencies that need to be shown there - otherwise users should not be individually committing package-lock.json to every single one of their PR's, if the PR has nothing to do with dependency updates. @jywarren can you please chime in here? @SteliosPhanartzis I will pull your PR again and take care of the package-lock.json issue for you. What you have to do is just address my comment above about the misplaced keybindings. |
@SteliosPhanartzis Ok you are good to go! Reminder to run |
@SteliosPhanartzis Due to lack of response (~ 13 days) I am closing this PR. It is essentially a part of what I am addressing in my current PR #229, so I am going to resolve it there. Otherwise, you will find more code conflicts here and this branch will go stale. So sorry to close this one on you! We totally understand it happens and I am always willing to make you a new FTO in this repo if you just mention me here. |
Some guidance on package-lock.json is here! hexojs/hexo#3370 -- so, we can better guarantee compatibility of specific dependency versions (not just semver.org ranges), AND dependabot uses package-lock.json to bump versions for security issues pretty regularly. |
Also it's recommended here: https://docs.npmjs.com/files/package-locks#using-locked-packages |
Thank you!!! |
Oh, i'm sorry - your question is not about whether it should be /tracked/, but whether it should be /gitignored/ -- yes, I'm OK with gitignoring it! |
@rexagod does that make sense to you? |
Just a bit confused on how are going to track lock files while ignoring them at the same time? |
We can rely on Dependabot for most of the updating. But if we do a big
breaking change, we will have to `git add -f` and commit them manually!
…On Tue, Apr 30, 2019 at 5:57 PM Pranshu Srivastava ***@***.***> wrote:
Just a bit confused on how would we track lock files while ignoring them
at the same time?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#216 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAAF6J47ETT4MKYKRMAEV4TPTC6ATANCNFSM4HGEL4LQ>
.
|
Okay, this makes sense. Thank you for clearing this out, @jywarren! |
References #211
Left comments next to associated key mappings.